Autogenerated HTML docs for v1.9.1-506-g7bf27
diff --git a/user-manual.txt b/user-manual.txt index d4f9804..022e74e 100644 --- a/user-manual.txt +++ b/user-manual.txt
@@ -4074,7 +4074,7 @@ Earlier we said that trivial merges are done inside `git read-tree -m`. For example, if the file did not change -from `$orig` to `HEAD` nor `$target`, or if the file changed +from `$orig` to `HEAD` or `$target`, or if the file changed from `$orig` to `HEAD` and `$orig` to `$target` the same way, obviously the final outcome is what is in `HEAD`. What the above example shows is that file `hello.c` was changed from
